Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Mar 2010 00:17:24 +0000 (00:17 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Mar 2010 00:17:24 +0000 (00:17 +0000)

Trivial merge